From: Jean Baptiste Favre Date: Fri, 25 Nov 2016 16:49:34 +0000 (+0100) Subject: Use system luajit or liblua X-Git-Tag: archive/raspbian/8.0.2+ds-1+rpi1~1^2^2^2^2^2^2^2^2~9 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=9a6b17d8fd45614d8e9228041237c3a32486319e;p=trafficserver.git Use system luajit or liblua Gbp-Pq: Name 0004-force-use-luajit-system-lib.patch --- diff --git a/lib/Makefile.am b/lib/Makefile.am index 4c522791..45055da8 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -25,32 +25,3 @@ endif if BUILD_WCCP SUBDIRS += wccp endif - -# Support verbose LuaJIT builds with "make V=1". -luajit__v_ = $(luajit__v_$(AM_DEFAULT_VERBOSITY)) -luajit__v_0 = @ -luajit__v_1 = - -# Some special hacks around building the luajit. -# -# - Copy the luajit source tree if we're doing out-of-source builds -# - Upon clean, remove the luajit tree from the out-of-source build tree -# -# Note: The LUAJIT_LDFLAGS is a bit of a hack, since LuaJIT on OmniOS needs -# the -m64 flag. See configure.ac. -# -all-local: - @echo "Making all in luajit" - test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/" - cd luajit && $(MAKE) $(AM_MAKEFLAGS) \ - BUILDMODE="static" \ - PREFIX="$(prefix)" \ - CC="$(CC)" \ - CFLAGS="$(LUAJIT_CFLAGS)" \ - XCFLAGS="" \ - LDFLAGS="$(LUAJIT_LDFLAGS)" \ - Q=$(luajit__v_$(V)) - -clean-local: - test "$(top_srcdir)" != "$(top_builddir)" || (cd "$(top_builddir)/$(subdir)/luajit" && $(MAKE) clean) - test "$(top_srcdir)" = "$(top_builddir)" || rm -rf "$(top_builddir)/$(subdir)/luajit" diff --git a/lib/Makefile.in b/lib/Makefile.in index b6369534..cc6607a6 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -305,9 +305,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -912,29 +912,6 @@ uninstall-am: .PRECIOUS: Makefile -# Some special hacks around building the luajit. -# -# - Copy the luajit source tree if we're doing out-of-source builds -# - Upon clean, remove the luajit tree from the out-of-source build tree -# -# Note: The LUAJIT_LDFLAGS is a bit of a hack, since LuaJIT on OmniOS needs -# the -m64 flag. See configure.ac. -# -all-local: - @echo "Making all in luajit" - test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/" - cd luajit && $(MAKE) $(AM_MAKEFLAGS) \ - BUILDMODE="static" \ - PREFIX="$(prefix)" \ - CC="$(CC)" \ - CFLAGS="$(LUAJIT_CFLAGS)" \ - XCFLAGS="" \ - LDFLAGS="$(LUAJIT_LDFLAGS)" \ - Q=$(luajit__v_$(V)) - -clean-local: - test "$(top_srcdir)" != "$(top_builddir)" || (cd "$(top_builddir)/$(subdir)/luajit" && $(MAKE) clean) - test "$(top_srcdir)" = "$(top_builddir)" || rm -rf "$(top_builddir)/$(subdir)/luajit" # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lib/bindings/Makefile.am b/lib/bindings/Makefile.am index b4a4737c..b4a320fa 100644 --- a/lib/bindings/Makefile.am +++ b/lib/bindings/Makefile.am @@ -19,9 +19,10 @@ include $(top_srcdir)/build/tidy.mk AM_CPPFLAGS += \ - $(LUAJIT_CPPFLAGS) \ + $(LUA_CPPFLAGS) \ -I$(abs_top_srcdir)/lib \ - -I$(abs_top_srcdir)/lib/records + -I$(abs_top_srcdir)/lib/records \ + $(LUA_CPPFLAGS) noinst_LTLIBRARIES = libbindings.la diff --git a/lib/bindings/Makefile.in b/lib/bindings/Makefile.in index 58253812..e0be05a7 100644 --- a/lib/bindings/Makefile.in +++ b/lib/bindings/Makefile.in @@ -243,7 +243,7 @@ pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ -AM_CPPFLAGS = @AM_CPPFLAGS@ $(LUAJIT_CPPFLAGS) -I$(abs_top_srcdir)/lib \ +AM_CPPFLAGS = @AM_CPPFLAGS@ $(LUA_CPPFLAGS) -I$(abs_top_srcdir)/lib \ -I$(abs_top_srcdir)/lib/records AM_CXXFLAGS = @AM_CXXFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ @@ -327,9 +327,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/lib/perl/Makefile.in b/lib/perl/Makefile.in index ada6e685..826d6204 100644 --- a/lib/perl/Makefile.in +++ b/lib/perl/Makefile.in @@ -242,9 +242,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/lib/records/Makefile.in b/lib/records/Makefile.in index e964ad2c..ba15f3e7 100644 --- a/lib/records/Makefile.in +++ b/lib/records/Makefile.in @@ -350,9 +350,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/lib/ts/Makefile.in b/lib/ts/Makefile.in index 4adfdb71..e32bd3ce 100644 --- a/lib/ts/Makefile.in +++ b/lib/ts/Makefile.in @@ -622,9 +622,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/lib/tsconfig/Makefile.in b/lib/tsconfig/Makefile.in index 70f34690..9dee2be8 100644 --- a/lib/tsconfig/Makefile.in +++ b/lib/tsconfig/Makefile.in @@ -399,9 +399,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ diff --git a/lib/wccp/Makefile.in b/lib/wccp/Makefile.in index 6c46f03c..44251c12 100644 --- a/lib/wccp/Makefile.in +++ b/lib/wccp/Makefile.in @@ -335,9 +335,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -LUAJIT_CFLAGS = @LUAJIT_CFLAGS@ -LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@ -LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_CPPFLAGS = @LUA_CPPFLAGS@ +LUA_LDFLAGS = @LUA_LDFLAGS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@